From 5968faef687788de1ecd79ee8bc42691e65f779d Mon Sep 17 00:00:00 2001 From: Jyrki Gadinger Date: Fri, 11 Jul 2025 08:30:26 +0200 Subject: [PATCH] ci: switch back to upstream CraftMaster MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The fix we needed was merged this week 🎉 https://invent.kde.org/packaging/craftmaster/-/merge_requests/7 Signed-off-by: Jyrki Gadinger --- .github/workflows/macos-build-and-test.yml | 2 +- .github/workflows/windows-build-and-test.yml | 2 +- admin/osx/mac-crafter/Sources/main.swift | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/macos-build-and-test.yml b/.github/workflows/macos-build-and-test.yml index 6f4fd7520..f6c59d491 100644 --- a/.github/workflows/macos-build-and-test.yml +++ b/.github/workflows/macos-build-and-test.yml @@ -46,7 +46,7 @@ jobs: - name: Download Craft run: | - git clone -q --depth=1 https://invent.kde.org/ggadinger/craftmaster.git ${{ env.CRAFT_MASTER_LOCATION }} + git clone -q --depth=1 https://invent.kde.org/packaging/craftmaster.git ${{ env.CRAFT_MASTER_LOCATION }} - name: Add Nextcloud client blueprints run: | diff --git a/.github/workflows/windows-build-and-test.yml b/.github/workflows/windows-build-and-test.yml index 6bfc44d7e..2aa869326 100644 --- a/.github/workflows/windows-build-and-test.yml +++ b/.github/workflows/windows-build-and-test.yml @@ -22,7 +22,7 @@ jobs: - name: Install Craft Master with Nextcloud Client Deps shell: pwsh run: | - & cmd /C "git clone -q --depth=1 https://invent.kde.org/ggadinger/craftmaster.git ${{ env.CRAFT_MASTER_LOCATION }} 2>&1" + & cmd /C "git clone -q --depth=1 https://invent.kde.org/packaging/craftmaster.git ${{ env.CRAFT_MASTER_LOCATION }} 2>&1" function craft() { python "${{ env.CRAFT_MASTER_LOCATION }}\CraftMaster.py" --config "${{ env.CRAFT_MASTER_CONFIG }}" --target ${{ env.CRAFT_TARGET }} -c $args diff --git a/admin/osx/mac-crafter/Sources/main.swift b/admin/osx/mac-crafter/Sources/main.swift index 8024ba878..11338ff51 100644 --- a/admin/osx/mac-crafter/Sources/main.swift +++ b/admin/osx/mac-crafter/Sources/main.swift @@ -43,7 +43,7 @@ struct Build: ParsableCommand { @Option(name: [.long], help: "Brew installation script URL.") var brewInstallShUrl = "https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh" - @Option(name: [.long], help: "CraftMaster git url.") + @Option(name: [.long], help: "CraftMaster Git URL.") var craftMasterGitUrl = "https://invent.kde.org/packaging/craftmaster.git" @Option(name: [.long], help: "Nextcloud Desktop Client craft blueprint git url.") -- 2.30.2